From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 17 Mar 2016 01:25:23 +0000 (+0000)
Subject: cgroups: Document the Debian memory resource controller config change
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~116
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com//styles.css/%22http:/www.example.com/styles.css?a=commitdiff_plain;h=c575fcc247c01545f0b3e3438d26111d377884b0;p=linux-4.9.git

cgroups: Document the Debian memory resource controller config change


Gbp-Pq: Topic debian
Gbp-Pq: Name cgroups-Document-the-Debian-memory-resource-controll.patch
---

diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
index ff71e16cc752..80eb01cbdc80 100644
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
@@ -52,6 +52,10 @@ Features:
  Kernel memory support is a work in progress, and the current version provides
  basically functionality. (See Section 2.7)
 
+NOTE: In Debian kernel packages, the memory resource controller is
+included but disabled by default.  Use the kernel parameter
+'cgroup_enable=memory' to enable it.
+
 Brief summary of control files.
 
  tasks				 # attach a task(thread) and show list of threads